removed leftover CVS conflict markers

diff --git a/ChangeLog b/ChangeLog
index 01857f23f4c3a4c20923f9e13b1bbda67909c2e4..1ebfce3cfd4ac66e8700c2465afd1c120665df88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,7 +101,6 @@
        * gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix
        a cast.
 
->>>>>>> 1.7541
 2006-02-17  Matthias Clasen  <mclasen@redhat.com>
 
        DND keynav support:
@@ -140,7 +139,6 @@
        * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
        Remove unnecessary checks.  
 
->>>>>>> 1.7533
 2006-02-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 01857f23f4c3a4c20923f9e13b1bbda67909c2e4..1ebfce3cfd4ac66e8700c2465afd1c120665df88 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -101,7 +101,6 @@
        * gtk/gtklinkbutton.c (gtk_link_button_class_init): Fix
        a cast.
 
->>>>>>> 1.7541
 2006-02-17  Matthias Clasen  <mclasen@redhat.com>
 
        DND keynav support:
@@ -140,7 +139,6 @@
        * gtk/gtkcolorbutton.c (gtk_color_button_[un]realize):
        Remove unnecessary checks.  
 
->>>>>>> 1.7533
 2006-02-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (gtk_icon_theme_list_icons): Give working